diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py
index 7002034..05ebfd2 100644
--- a/tools/buildman/builder.py
+++ b/tools/buildman/builder.py
@@ -1115,6 +1115,8 @@
         create. Having left over directories is confusing when the user wants
         to check the output manually.
         """
+        if not self.commits:
+            return
         dir_list = []
         for commit_upto in range(self.commit_count):
             dir_list.append(self._GetOutputDir(commit_upto))